From: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
Date: Wed, 1 Oct 2025 18:43:25 +0000 (-0400)
Subject: avoid redundant rpath entries on multiarch systems
X-Git-Tag: archive/raspbian/2.17.0+ds-6+rpi1^2^2^2^2^2~15
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6cb2dadc3bf5d8f568572392c4b074739f558546;p=ncbi-blast%2B.git

avoid redundant rpath entries on multiarch systems

 * src/build-system/configure(.ac): when ensuring that executables
   will be able to find libstdc++, don't add rpath entries that files
   under /etc/ld.so.conf.d already specify, even if they don't resemble
   traditional single-architecture or biarch locations.

Debian-Bug: 633567.
Author: Aaron M. Ucko <ucko@debian.org>
Last-Update: 2011-08-28

Gbp-Pq: Name no_multiarch_rpath
---

diff --git a/c++/src/build-system/configure b/c++/src/build-system/configure
index 4a45de55..492675b4 100755
--- a/c++/src/build-system/configure
+++ b/c++/src/build-system/configure
@@ -11052,7 +11052,7 @@ case "$compiler:$compiler_version:$with_bin_release:$ncbi_cv_prog_cxx_stdlib_lib
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac
diff --git a/c++/src/build-system/configure.ac b/c++/src/build-system/configure.ac
index 0e5fcd08..64449862 100644
--- a/c++/src/build-system/configure.ac
+++ b/c++/src/build-system/configure.ac
@@ -2537,7 +2537,7 @@ case "$compiler:$compiler_version:$with_bin_release:$ncbi_cv_prog_cxx_stdlib_lib
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac